Начало Разгледай Помощ
Регистриране Влизане
Pai2
/
pai2
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
Rename field name

Brightcells преди 9 години
родител
da19301800
ревизия
c7abce172a
променени са 4 файла, в които са добавени 123 реда и са изтрити 19 реда
Покажи статистика за разликите
  1. 98 0
      account/migrations/0019_auto_20161024_1235.py
  2. 12 6
      account/models.py
  3. 8 8
      group/lensman_views.py
  4. 5 5
      pay/views.py

+ 98 - 0
account/migrations/0019_auto_20161024_1235.py
Преглед на файла 

@@ -0,0 +1,98 @@
1 
+# -*- coding: utf-8 -*-
2 
+from __future__ import unicode_literals
3 
+
4 
+from django.db import models, migrations
5 
+
6 
+
7 
+class Migration(migrations.Migration):
8 
+
9 
+    dependencies = [
10 
+        ('account', '0018_auto_20161020_1844'),
11 
+    ]
12 
+
13 
+    operations = [
14 
+        migrations.RemoveField(
15 
+            model_name='lensmanincomeexpensesinfo',
16 
+            name='freeze_amount',
17 
+        ),
18 
+        migrations.RemoveField(
19 
+            model_name='lensmanincomeexpensesinfo',
20 
+            name='freeze_balance',
21 
+        ),
22 
+        migrations.RemoveField(
23 
+            model_name='lensmaninfo',
24 
+            name='freeze_balance',
25 
+        ),
26 
+        migrations.RemoveField(
27 
+            model_name='userincomeexpensesinfo',
28 
+            name='freeze_amount',
29 
+        ),
30 
+        migrations.RemoveField(
31 
+            model_name='userincomeexpensesinfo',
32 
+            name='freeze_balance',
33 
+        ),
34 
+        migrations.RemoveField(
35 
+            model_name='userinfo',
36 
+            name='freeze_balance',
37 
+        ),
38 
+        migrations.AddField(
39 
+            model_name='lensmanincomeexpensesinfo',
40 
+            name='freeze_expense_amount',
41 
+            field=models.IntegerField(default=0, help_text='\u652f\u51fa\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u6570\u91cf(\u5206)', verbose_name='freeze_expense_amount'),
42 
+        ),
43 
+        migrations.AddField(
44 
+            model_name='lensmanincomeexpensesinfo',
45 
+            name='freeze_expense_balance',
46 
+            field=models.IntegerField(default=0, help_text='\u652f\u51fa\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u540e\u6570\u91cf(\u5206)', verbose_name='freeze_expense_balance'),
47 
+        ),
48 
+        migrations.AddField(
49 
+            model_name='lensmanincomeexpensesinfo',
50 
+            name='freeze_income_amount',
51 
+            field=models.IntegerField(default=0, help_text='\u6536\u5165\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u6570\u91cf(\u5206)', verbose_name='freeze_income_amount'),
52 
+        ),
53 
+        migrations.AddField(
54 
+            model_name='lensmanincomeexpensesinfo',
55 
+            name='freeze_income_balance',
56 
+            field=models.IntegerField(default=0, help_text='\u6536\u5165\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u540e\u6570\u91cf(\u5206)', verbose_name='freeze_income_balance'),
57 
+        ),
58 
+        migrations.AddField(
59 
+            model_name='lensmaninfo',
60 
+            name='freeze_expense_balance',
61 
+            field=models.IntegerField(default=0, help_text='\u6444\u5f71\u5e08\u652f\u51fa\u51bb\u7ed3\u4f59\u989d(\u5206)', verbose_name='freeze_expense_balance'),
62 
+        ),
63 
+        migrations.AddField(
64 
+            model_name='lensmaninfo',
65 
+            name='freeze_income_balance',
66 
+            field=models.IntegerField(default=0, help_text='\u6444\u5f71\u5e08\u6536\u5165\u51bb\u7ed3\u4f59\u989d(\u5206)', verbose_name='freeze_income_balance'),
67 
+        ),
68 
+        migrations.AddField(
69 
+            model_name='userincomeexpensesinfo',
70 
+            name='freeze_expense_amount',
71 
+            field=models.IntegerField(default=0, help_text='\u652f\u51fa\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u6570\u91cf(\u5206)', verbose_name='freeze_expense_amount'),
72 
+        ),
73 
+        migrations.AddField(
74 
+            model_name='userincomeexpensesinfo',
75 
+            name='freeze_expense_balance',
76 
+            field=models.IntegerField(default=0, help_text='\u652f\u51fa\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u540e\u6570\u91cf(\u5206)', verbose_name='freeze_expense_balance'),
77 
+        ),
78 
+        migrations.AddField(
79 
+            model_name='userincomeexpensesinfo',
80 
+            name='freeze_income_amount',
81 
+            field=models.IntegerField(default=0, help_text='\u6536\u5165\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u6570\u91cf(\u5206)', verbose_name='freeze_income_amount'),
82 
+        ),
83 
+        migrations.AddField(
84 
+            model_name='userincomeexpensesinfo',
85 
+            name='freeze_income_balance',
86 
+            field=models.IntegerField(default=0, help_text='\u6536\u5165\u51bb\u7ed3\u4f59\u989d\u589e\u51cf\u540e\u6570\u91cf(\u5206)', verbose_name='freeze_income_balance'),
87 
+        ),
88 
+        migrations.AddField(
89 
+            model_name='userinfo',
90 
+            name='freeze_expense_balance',
91 
+            field=models.IntegerField(default=0, help_text='\u7528\u6237\u652f\u51fa\u51bb\u7ed3\u4f59\u989d(\u5206)', verbose_name='freeze_expense_balance'),
92 
+        ),
93 
+        migrations.AddField(
94 
+            model_name='userinfo',
95 
+            name='freeze_income_balance',
96 
+            field=models.IntegerField(default=0, help_text='\u7528\u6237\u6536\u5165\u51bb\u7ed3\u4f59\u989d(\u5206)', verbose_name='freeze_income_balance'),
97 
+        ),
98 
+    ]

+ 12 - 6
account/models.py
Преглед на файла 

@@ -51,7 +51,8 @@ class LensmanInfo(CreateUpdateMixin):
51 51 
     origin = models.IntegerField(_(u'origin'), default=999, help_text=u'摄影师高清图价格(分)')
52 52
53 53 
     balance = models.IntegerField(_(u'balance'), default=0, help_text=u'摄影师余额(分)')
54 
-    freeze_balance = models.IntegerField(_(u'freeze_balance'), default=0, help_text=u'摄影师冻结余额(分)')
54 
+    freeze_income_balance = models.IntegerField(_(u'freeze_income_balance'), default=0, help_text=u'摄影师收入冻结余额(分)')
55 
+    freeze_expense_balance = models.IntegerField(_(u'freeze_expense_balance'), default=0, help_text=u'摄影师支出冻结余额(分)')
55 56
56 57 
     user_status = models.IntegerField(_(u'user_status'), choices=USER_STATUS, default=UNVERIFIED)
57 58 
     refused_reason = models.TextField(_(u'refused_reason'), blank=True, null=True, help_text=u'审核拒绝原因')
 
@@ -119,8 +120,10 @@ class LensmanIncomeExpensesInfo(CreateUpdateMixin):
119 120 
     type = models.IntegerField(_(u'type'), choices=TYPE, default=INCOME, help_text=u'收支类别')
120 121 
     amount = models.IntegerField(_(u'amount'), default=0, help_text=u'余额增减数量(分)')
121 122 
     balance = models.IntegerField(_(u'balance'), default=0, help_text=u'余额增减后数量(分)')
122 
-    freeze_amount = models.IntegerField(_(u'freeze_amount'), default=0, help_text=u'冻结余额增减数量(分)')
123 
-    freeze_balance = models.IntegerField(_(u'freeze_balance'), default=0, help_text=u'冻结余额增减后数量(分)')
123 
+    freeze_income_amount = models.IntegerField(_(u'freeze_income_amount'), default=0, help_text=u'收入冻结余额增减数量(分)')
124 
+    freeze_income_balance = models.IntegerField(_(u'freeze_income_balance'), default=0, help_text=u'收入冻结余额增减后数量(分)')
125 
+    freeze_expense_amount = models.IntegerField(_(u'freeze_expense_amount'), default=0, help_text=u'支出冻结余额增减数量(分)')
126 
+    freeze_expense_balance = models.IntegerField(_(u'freeze_expense_balance'), default=0, help_text=u'支出冻结余额增减后数量(分)')
124 127
125 128 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
126 129 
 
@@ -216,7 +219,8 @@ class UserInfo(CreateUpdateMixin):
216 219 
     location = models.CharField(_(u'location'), max_length=255, blank=True, null=True, help_text=u'用户地址')
217 220
218 221 
     balance = models.IntegerField(_(u'balance'), default=0, help_text=u'用户余额(分)')
219 
-    freeze_balance = models.IntegerField(_(u'freeze_balance'), default=0, help_text=u'用户冻结余额(分)')
222 
+    freeze_income_balance = models.IntegerField(_(u'freeze_income_balance'), default=0, help_text=u'用户收入冻结余额(分)')
223 
+    freeze_expense_balance = models.IntegerField(_(u'freeze_expense_balance'), default=0, help_text=u'用户支出冻结余额(分)')
220 224
221 225 
     user_status = models.IntegerField(_(u'user_status'), choices=USER_STATUS, default=UNVERIFIED)
222 226 
 
@@ -297,8 +301,10 @@ class UserIncomeExpensesInfo(CreateUpdateMixin):
297 301 
     type = models.IntegerField(_(u'type'), choices=TYPE, default=INCOME, help_text=u'收支类别')
298 302 
     amount = models.IntegerField(_(u'amount'), default=0, help_text=u'余额增减数量(分)')
299 303 
     balance = models.IntegerField(_(u'balance'), default=0, help_text=u'余额增减后数量(分)')
300 
-    freeze_amount = models.IntegerField(_(u'freeze_amount'), default=0, help_text=u'冻结余额增减数量(分)')
301 
-    freeze_balance = models.IntegerField(_(u'freeze_balance'), default=0, help_text=u'冻结余额增减后数量(分)')
304 
+    freeze_income_amount = models.IntegerField(_(u'freeze_income_amount'), default=0, help_text=u'收入冻结余额增减数量(分)')
305 
+    freeze_income_balance = models.IntegerField(_(u'freeze_income_balance'), default=0, help_text=u'收入冻结余额增减后数量(分)')
306 
+    freeze_expense_amount = models.IntegerField(_(u'freeze_expense_amount'), default=0, help_text=u'支出冻结余额增减数量(分)')
307 
+    freeze_expense_balance = models.IntegerField(_(u'freeze_expense_balance'), default=0, help_text=u'支出冻结余额增减后数量(分)')
302 308
303 309 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
304 310

+ 8 - 8
group/lensman_views.py
Преглед на файла 

@@ -319,8 +319,8 @@ def lensman_origin_photo_upload_api(request):
319 319 
                 type=UserIncomeExpensesInfo.INCOME,
320 320 
                 amount=order.total_fee,
321 321 
                 balance=from_user.balance,
322 
-                freeze_amount=0,
323 
-                freeze_balance=from_user.freeze_balance,
322 
+                freeze_income_amount=0,
323 
+                freeze_income_balance=from_user.freeze_income_balance,
324 324 
                 remark=u'高清图购买退款',
325 325 
             )
326 326 
 
@@ -332,7 +332,7 @@ def lensman_origin_photo_upload_api(request):
332 332
333 333 
         if to_user:
334 334 
             # 余额减少
335 
-            to_user.freeze_balance -= order.total_fee
335 
+            to_user.freeze_income_balance -= order.total_fee
336 336 
             to_user.save()
337 337 
             # 余额记录
338 338 
             UserIncomeExpensesInfo.objects.create(
 
@@ -341,8 +341,8 @@ def lensman_origin_photo_upload_api(request):
341 341 
                 type=UserIncomeExpensesInfo.EXPENSE,
342 342 
                 amount=order.total_fee,
343 343 
                 balance=to_user.balance,
344 
-                freeze_amount=0,
345 
-                freeze_balance=to_user.freeze_balance,
344 
+                freeze_income_amount=0,
345 
+                freeze_income_balance=to_user.freeze_income_balance,
346 346 
                 remark=u'高清图购买退款',
347 347 
             )
348 348 
 
@@ -392,7 +392,7 @@ def lensman_origin_photo_upload_api(request):
392 392 
         if to_user:
393 393 
             # 余额解冻
394 394 
             to_user.balance += order.total_fee
395 
-            to_user.freeze_balance -= order.total_fee
395 
+            to_user.freeze_income_balance -= order.total_fee
396 396 
             to_user.save()
397 397 
             # Redis 数值更新
398 398 
             set_brief_info(order.to_uid, order.photo_type, order.total_fee, dt=order.created_at)
 
@@ -403,8 +403,8 @@ def lensman_origin_photo_upload_api(request):
403 403 
                 type=UserIncomeExpensesInfo.UNFREEZE,
404 404 
                 amount=order.total_fee,
405 405 
                 balance=to_user.balance,
406 
-                freeze_amount=order.total_fee,
407 
-                freeze_balance=to_user.freeze_balance,
406 
+                freeze_income_amount=order.total_fee,
407 
+                freeze_income_balance=to_user.freeze_income_balance,
408 408 
                 remark=u'高清图购买退款',
409 409 
             )
410 410

+ 5 - 5
pay/views.py
Преглед на файла 

@@ -143,7 +143,7 @@ def order_paid_success(order):
143 143
144 144 
     if order.photo_type == OrderInfo.NOMARK:
145 145 
         # 余额增加
146 
-        amount, freeze_amount = total_fee, 0
146 
+        amount, freeze_income_amount = total_fee, 0
147 147 
         user.balance += amount
148 148 
         # Redis 数值更新
149 149 
         set_brief_info(to_uid, order.photo_type, total_fee)
 
@@ -154,13 +154,13 @@ def order_paid_success(order):
154 154 
             type=UserIncomeExpensesInfo.INCOME,
155 155 
             amount=amount,
156 156 
             balance=user.balance,
157 
-            freeze_amount=freeze_amount,
158 
-            freeze_balance=user.freeze_balance,
157 
+            freeze_income_amount=freeze_income_amount,
158 
+            freeze_income_balance=user.freeze_income_balance,
159 159 
             remark=u'图片购买',
160 160 
         )
161 161 
     elif order.photo_type == OrderInfo.ORIGIN:
162 
-        amount, freeze_amount = 0, total_fee
163 
-        user.freeze_balance += freeze_amount
162 
+        amount, freeze_income_amount = 0, total_fee
163 
+        user.freeze_income_balance += freeze_income_amount
164 164 
     user.save()
165 165
166 166